bitkeeper revision 1.1386 (426e4422Fnf4uJoD_xnCwL17Xg94aA)

remove redundant NULL check before xfree()

Signed-off-by: Vincent Hanquez <vincent@xensource.com>

diff --git a/xen/arch/x86/shadow.c b/xen/arch/x86/shadow.c
index 1db8ed71e9b57580e52a2f70eb85317d4b9c3860..4413d48da0e7c50b879bc7302fc79d1e26d9ea97 100644 (file)
--- a/xen/arch/x86/shadow.c
+++ b/xen/arch/x86/shadow.c
@@ -981,12 +981,12 @@ int __shadow_mode_enable(struct domain *d, unsigned int mode)
     return 0;
 
  nomem:
-    if ( (new_modes & SHM_enable) && (d->arch.shadow_ht != NULL) )
+    if ( (new_modes & SHM_enable) )
     {
         xfree(d->arch.shadow_ht);
         d->arch.shadow_ht = NULL;
     }
-    if ( (new_modes & SHM_log_dirty) && (d->arch.shadow_dirty_bitmap != NULL) )
+    if ( (new_modes & SHM_log_dirty) )
     {
         xfree(d->arch.shadow_dirty_bitmap);
         d->arch.shadow_dirty_bitmap = NULL;

diff --git a/xen/common/dom0_ops.c b/xen/common/dom0_ops.c
index da454a479a1723130e5352c1cde9a650779bf129..dcab2dd0d31feb4ee9167ff2403be94b4dbb8015 100644 (file)
--- a/xen/common/dom0_ops.c
+++ b/xen/common/dom0_ops.c
@@ -349,8 +349,7 @@ long do_dom0_op(dom0_op_t *u_dom0_op)
             if ( copy_to_user(op->u.getdomaininfo.ctxt, c, sizeof(*c)) )
                 ret = -EINVAL;
 
-            if ( c != NULL )
-                xfree(c);
+            xfree(c);
         }
 
         if ( copy_to_user(u_dom0_op, op, sizeof(*op)) )     

diff --git a/xen/common/domain.c b/xen/common/domain.c
index 742ca462a56ce19728a5025d262707684f9c6a38..1184dbaf6752cfdaf33d43ef3caeb04590f438ff 100644 (file)
--- a/xen/common/domain.c
+++ b/xen/common/domain.c
@@ -257,8 +257,7 @@ int set_info_guest(struct domain *p, dom0_setdomaininfo_t *setdomaininfo)
     set_bit(DF_CONSTRUCTED, &p->d_flags);
 
  out:    
-    if ( c != NULL )
-        xfree(c);
+    xfree(c);
     return rc;
 }
 
@@ -313,8 +312,7 @@ long do_boot_vcpu(unsigned long vcpu, full_execution_context_t *ctxt)
     return 0;
 
  out:
-    if ( c != NULL )
-        xfree(c);
+    xfree(c);
     arch_free_exec_domain_struct(d->exec_domain[vcpu]);
     d->exec_domain[vcpu] = NULL;
     return rc;

diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c
index ca7ee36495cfa51635429c6ab8aec402600d0d79..7fdc92c9b95bafb55014af1adbb6d597bb244e98 100644 (file)
--- a/xen/common/grant_table.c
+++ b/xen/common/grant_table.c
@@ -1122,8 +1122,7 @@ grant_table_create(
  no_mem:
     if ( t != NULL )
     {
-        if ( t->active != NULL )
-            xfree(t->active);
+        xfree(t->active);
         if ( t->maptrack != NULL )
             free_xenheap_page((unsigned long)t->maptrack);
         xfree(t);

diff --git a/xen/common/physdev.c b/xen/common/physdev.c
index de3bd331a11fdd9b169e67f85a61b304006e718e..d1eee0a30733a4fc6606ed246cc91fe5d9e29d3b 100644 (file)
--- a/xen/common/physdev.c
+++ b/xen/common/physdev.c
@@ -146,11 +146,8 @@ void physdev_destroy_state(struct domain *d)
 {
     struct list_head *ent;
 
-    if ( d->arch.iobmp_mask != NULL )
-    {
-        xfree(d->arch.iobmp_mask);
-        d->arch.iobmp_mask = NULL;
-    }
+    xfree(d->arch.iobmp_mask);
+    d->arch.iobmp_mask = NULL;
 
     while ( (ent = d->pcidev_list.next) != &d->pcidev_list )
     {